Change the implementation of sleep and remove NOOP