cleanups ready for proto gen