Removed more unnecessary code