More clean up due to csscomb order issue.