Removed unnecessary handles