Deleted some old/commented-out code