Remove some unused classes
Remove unused div
HTML cleanup