Cleanup code, ready for release