remove legacy code and rename subsystems