Make static functions in class
Comment out unused code