Code Cleanup

Needs queue worker notifications revision.