Tidied up, removed a plugin