Clean code, remove no more used (for age) classes