High level cleaning

Master Clean