Fixed: Removed some unnecessary code