rm more abstraction, dead code, inline trivial functions