More performance improvements and experiments. Removed some unused commented lines.

Signed-off-by: Michael Head <michaelehead@gmail.com>