delete redundant classes
move method to util