[packages,*] Cleaning up obsolete code