Removed 'mark' from many places in the codebase.