Removed and commented some unused code.