remove useless code to prepare for v4