Remove extraneous console.logs, clean up some temporarily commented-out code