Remove old, commented out code
Finish chapter on CPS translation