[FEATURE] Removed storage and removed instantiations of classes