change close() method so it returns a model that documents anything that a Sink might do,  do necessary refactoring,  but demolish any classes that would have needed refactoring that are not in active use