Remove some accidentally included files and remove Shell import