Cleanup vol 4

Tested & working