Removed previously commented-out sections from last commit