removed stale code 2