Comment cleanup for public push