Removed unnecessary dummy classes