minor changes and removing unused requires