Complete clean tested and working