Removed unnecessary require()s and other cleanup