Cleanup
Moving to 2.1.5 because given up on 2.2.0 support coming to Heroku soon