General code cleanup, some updates to requirements.txt

requirements.txt still needs more cleanup of obsolete modules.