Fix expansion info; Remove unneeded code