Removed and cleaned up some code!