remove unused elements. and refactor class name.