Removed redundant code & sounds