cleanup

cleanup of commented/unused code segments