Cleanup in ProfileService