Fix for Issue #34
Removed AUX event
some cleanup