Cleaned up a bit of un-needed code