Cleened up unused variables