Removed Dupe / Fix Build Error