Removed all direct accordion references