More cleanup, there was duplicates of code that needed to be removed. It was causing double buy of things.