Comments, remove debug code