Deleted manual check task and setup listner correctly.

This will prevent the task from working Async if sent manually.
Shouldn’t be a performance hit though.