some cleanup as i debug
Merge pull request #2500 from stefanpenner/cleanup

some cleanup as i debug