Remove PCL Model and storage logic code on library