Commented out some stuff that was breaking