Removed guard code