Remove redundant message and add a switch for simply scheduling