Cleaned out unused namespaces in master.xml