Cleaning

Disabled cleaning and fixed refilling