Commented some legacy stuff