cleanup superfluous commits
tests now work without any import errors, key errors, or syntax errors.