Removed dead code
Removed unused code which killed performance
Clean up