removed stale code
finishing up