Removed a load of unused abstractions