Chnaged submission to proposal
Clean up of Event publisher