removed hardcoded event listeners