Clean up and give direct connection