Take out some stupid proxying logic