Start of tidy up.