jmontleon more cleanup