Cleaned out some un-needed code