Renamed stuff, removed unused stuff