[BACKLOG-1138] Cleanup thin model