Remove duplicate directives, reduce tabstop
Remove unusued old commands