cleanup
more Apollo