Removed excess code
WIERD MERGE ERROR!?!?!?!