Package cleanup and use etex