Adjusted listed
Clean-up