Clean the ajax stuff  - fix #2