Can all of this commented out code get deleted?