Do some cleanup and convert to use sub app instead of passing in external app