remove options subsystem
remove legacy code