popcorn.proto clean up