renaming and removing unused stuff