PA PIE : CleanUp and multi-user aware