Revert "More Housekeeping"

This reverts commit 0e137b71529a390cea6e4aadd19320c8c8951d9c.
Revert "Revert "More Housekeeping""

This reverts commit a16128bd5d326e0584360bee4f3dc232c7649fc1.
Revert "Revert "Revert "More Housekeeping"""

This reverts commit 7139316100a5a89cf8b2149f250c3a75912fcd18.
Revert "Revert "Revert "Revert "More Housekeeping""""

This reverts commit ca769ada24cb649a678cf3e9d9d7eab27a4fe708.
Revert "AudioManager work"

This reverts commit 0fdae0017d5eb48e9d3d2e5df8bb9f5d445fb6bc.
Triple revert to fix Splash Screen