Removed custom events module