Code Clean P1
Revert "Code Clean P1"

This reverts commit 9528a28a5a6ca1a4953e56150cda5536b7b60929.