Code cleanup and simplification

Allow for title to be changed using message

Change-Id: If0b780b528c18654fb678c0c85f394df2f2c7e82
Remove numerous debug statements

Change-Id: Iddd33d3fa502c92a62f88b6690ed6bfc88603234