Worked on cleaning plugins up