Leftover comments removed