Remove not requested functionality