further cleanup, based on self-code review (removing mock, backing out accidental changes, removing unused file)