Some cleaning

Cleaning