vid-1115 removed unnecessary if statements when setting up hooks