removed unused code
renaming