cleanup on architecture