Remove obsoleted requirements, fix some formatting