use statement cleanup