Remove some obsolete methods