Removed PCL Storage package
Changed String empty compares for faster length greater than 0