removed all non vital classes