Cleanup usings, and dead test code