#799 removed comments per @moollaza request