Remove stock comments, test, and unneeded brackets.