Commenting global handler for now