Undo Files merged from Master

Octorpess can be funky!