removed stale code 2 (really need to learn how to merge)