Misc #3 fixes
Removed unwanted dublicates