WIP CW-153 - Cleanup