remove some unnecessary checks & complications