removed some primitive obsession