Removed not needed items