and strip away some stuff in rsc that should now be dead

Change-Id: I6411e706c50dff299099680f1f942bf61c4e79f2