RSC #1
Some lazy cleanup.