Committed out code not needed and remove min