cstyle errors
unused code cleanup