Refactored out value cleanup