Remove overrides so it works in Java 6 + 7
Add grib parameters to database