ntuplers cleaned up