1. Clean up based upon ariel view

    Closed · #2564150
    0