#349 - Cleaning