remove some useless container classes