some cleanup with custom uorb messages and includes