Removed _p usage from variables code, other code will need to be updated not to use them