cleanup+added Client and Server plugins