Flake8 pass; removed unused test stuff