Remove old outcommented code that has not been used in forever