Cleanup, test converage for unsync