Updated the default codec settings
Removed some more unneeded unsafe stuff
Merge remote-tracking branch 'origin/master' into rework