Remove some functionality