improved performance by removing obsolete hook