Remove more unneeded skip functions. Add a comment because we do have to time out effectively