Deletes all the excess accounting stuff from the application
Merge branch 'master' into vgdev