Major preformance optimisation
Cleanup