Clean-up: remove useless code