Clean ALL task
Major changes