Tidy up base application