cleanup in progress; made depend on ender