Remove un-needed hooks