memory cleaning after build
refactoring