General all round clean up.