Removed more unnecessary code.