Doing some cleaning

Doing some cleaning

925