Level 1 cleaning up + Weights removal