remove uncommented, useless, stale, code, jason