Tidy up, redundant code