15x fold performance boost, other optimization
Removed debugging files