feat(cleanup): code cleanup

Removes bad error emitting.