Commented out some of johans unused code.