Remove Junk Code