nick-remove cleanup