Removed more unnecesary code.