Cleaning from comments