Cleaned up commented-out frictionless menu code.