Cleanup in code