Commented out unused functions and variables