cleanup, ready for merge