lot more cleanup