[IMP-dev] Removing deprecated classes