There should be some adjustments, but removing the whole concept is a bad idea imo.