Remove connection
Fix templates