Clean up use statements