Doing more cleanup for crappy heroku data