#125 Cleanup