Remove use of 'with' function.