Remove a host of unused variables