More optimizations; removed PIT crud.
Added optimizations.