handles require flags

- some clean up