trivial clean up
renaming and deleting outdated code