finish epic editor clean up and fix #591