Remove un need function wrapper for the events