Remove unfinished/experimental code
Use consistent naming of handlers