Cleaning

Some cleaning