cleanup in code