removed stale code (need to learn how to merge)