Fixed style.
Removed useless classes.
Removed deprecated class.