Cleaned up code to get rid of commented out code.