- commented junk removed