cleanup
Switch to jackson 2 and remove GSon