underscore cleanup