Remove un-needed function