-Cleanup: remove useless code