[TASK] Annotations marking deprecation and an additional refactoring