Purchase system up + A lot of cleanUp