Remove some obsolete parts