Removed extra junk that was merged wrong