Removed more temp stuff