Remove some obsolete stuff