got rid of redundant classes