Got rid of redundant classes