Remove samples, improve speed, add proxy, etc