cleanup, remove useless code