Cleanup. Removed unnecessary code.