todos removed from ottemo.go