Clear some whitespace
Safe scope is only inside functions. Necessary to wrap the async handlers.
Remove outdated tests