Cleanup usings and old code