Cleanup use statements