Removed warnings. Commented out unused functions.