CleanUp for CompatApp