Remove duplicated class defintions