Removed MORE unnecessary code