Task end options

Delete testing code if it's not used anymore. it's easy to add back if we need it.