Simplify & remove cruft