Remove more unncessary code