More cleanup, changing line-ending to unix (LEV-77)