Deleted out some old commented-out code