removed some excessive checks