Removed detrimental/unneeded leftover code