removed redundant callback section