Maintenence: remove dead code, rename stuff