Copypaste cleanup #67