Cleanup connect and remove methods