Revert "Modelines: add byte-order-mark & small fixes"
This reverts commit bffb66cb3ed811a0e7cd9882dc1545eadc8a722a.