cleanup on high perf design code