tidy up application submission message handler