Removed debug code.
Cleanup of unused things.
Cleanup + source optimizations.