Removed more unnecessary stuff.