removing solutions and tidying