Cleaning up some requires