Commented out unneeded functions