Cleanup return paths