Cleaned up some requires here and there