Code clean up of clean up action
15 files changed