Cleanup
Cleanup and preliminary support for RLU/NRLU