Remove joins to unit fields