Could we just implement this function as empty or remove them totally. Commented out code is kind of strange.