Cleanup ADM Code