cleaned up commented-out lines