more cleanup

final v ersion