proto cleanups