Fixed Broken References and deleted unused File