Revert "redundand classes deleted"

This reverts commit e585f49ed1e9e9e22de0b0460605e75271be3b97.