Import clean up and put back in of getExpression().