Refactor data classes to remove useless properties