cleanup; shift responsibility into og.go