Removed more unwanted functionality