Removing test code
Extracted some sounds