Disable async

Transitioned to a async hook disable function and fixed a few issues on the way.