backend review and remove unsused