Removed no longer needed class VariableStorage