Cleaned up un-needed code