Revert "Modelines: add byte-order-mark & small fixes"

Authored by cullmann on Aug 14 2018, 3:13 PM.