Remove Hildon1 conditional code from hildon2.