Bluray: remove more outdated code
Bluray: reindent headers