final cleanup of app functionality