UCT: Remove non-RAVE AMAF support; induces extra mess and overhead