removing unnecessary guards