Cleaning up proxy factory

Just some old code removal (done while I was checking if another rebase was needed :S )