Cleaned u code and where leakage/pollution should no longer occur.