clean up fixes - branch was merged, not for dev only, perhaps