Removed some of the thorny stuff from the requirements