Lots more cleanup
Bump rct