Remove dead tests
Cleanup formatting.