[BUGFIX] Streamline deprecation messages