Removes more unnecessary code