general cleanup - adding dependencies back into setup.py