Tidy up unused parts of app