PROJECT - Refactoring of useless classes.