reformat
removed unused code