Removing use of Type flag from codebase.