Removed more not needed items