FIX: removed unused local variables.
FIX: removed leftover debugging code.