more cleanup
final cleanup