Cleanup - move to protos declarations