removed user and programmatie
removed programmatiefase
cleanup
cleanup query
fixed json dependency issue