Remove unnecessary classess