Cleaned up some requires