Commented out js includes to prevent conflict