I like having the extra functions, there will probably be no penalty in keeping the extra code, as we already sorted out this class in gitdefence.