remove un-necessary checks