switch to new-style classes, remove dead code