Cleanup, removed print-like log.error statements
Do not remove message blueprint as it's referenced in a number of places