Turned some unused functions into comments