Removing layer2 behvaior upon flies, deprecating unused variables.