Clean up unused bindings and imports