Remove phactory dependences