cleanup, ready for deployment