clean up some dead python code, add __init__s