Deleted and removed problem files. Replaced with working code