Removed future with_statement