Remove rough overload control code (moved to an experimental branch