Remove compiler conditions v3