VE-1355: Cleanup