Remove stub from wrong place
Clean up unneeded defs