Remove some smells