removed weird proxy implementation