Changes for cleanup code