Styles fixes
Remove unused code