final factories & removed unused injections