some fixes for factoring
removed unused file