[JRO] Remove controllers no longer needed