Closes #247 - Remove redundant messaging