Comment unused functions for now