Deprecate functions as collectable
Fix build