Programmes space & redundancy tidy up.