Some clean-up
Switch to async library