Fixing outstanding issues with deletion of instances. Adding a small timeout to htpassword deletion as well.