Removed some un-needed code from the old project