Removed unnecessary mods, bug fixes