remvove unnecessary checks