Crypsis: Cleanup topic/default and message layouts