Fixing to one platform

Starting at one platform to implemet other variables
More platform removal and bug fixes