Removes more unneeded code