Remove unused abstractions