more removal of existing functionalities