Made the factory a bit nicer and...

...removed some unneeded packages