Yes Mike I think that removal of pain is one description of producing pleasure, but not the only way, as illustrated by the smelling of the rose example. There was no real pain present with the rose was smelled, or that was relieved by smelling the rose.
This issue (pleasure obtained by filling a need / healing a pain) is closely related to the "replenishment" theory of pleasure discussed at length in the Gosling and Taylor book as one of the theories of pleasure, but I recall that the book discusses how the Greeks abandoned this as a complete discussion of the process. I will see if I can point to some excerpts but it may take me as while...
OK a few clips:
1 - Illustrating Plato using replenishment as the basis of his theory of pleasure, which allows him to categorize it as inferior to philosophic pursuit: