Revert "Add cpu_speed to flavors"

This reverts commit 4d859d6fbee0dd17638b942ba680e91aacd01b49.