Remove unnecessary dependency overhead