#36 misc cleanup