get rid of some unecessary requires, make some explicit