Commented some unused code, to be removed later.