Remove premature abstractions