improving the client removing rubbish pt 1