src: refractor
src: implemented removal of sounds