removed some requires