x-app cleanup