lint
zap dead code & tests