Don't leave in a bunch of commented-out stuff like this; if we want to keep the comments, move them above appropriately.