Removing some un-needed code