tidying

general tidying and removing of unused plugins etc