refactor: remove a little handler abstraction

Maybe we'll need it again later, but lets keep it simple for now.