AS7-6661 AS7-6673 etc Remove unused deprecated stuff from controller module

Also, Kabir's patch to make subsystem-test use the legacy dependencies for its full classpath