Strip out unneeded code