minimal changes to cleanup