Clean code and remove useless class