Removed mock flag