Remove obsolete abstractions