remove old dead code ready for release