Push on with the cleanup