Remove that ugly factory stuff :-)