Removed duplicate audio listeners
Merge branch 'Jason'