remove stale/unused code