Feature/removed guard