More code cleansing.......