Renaming + Removing unused things