JDK 7
Temp remove db conf for heroku testing