Remove dead cruft, continue abstraction