Cleaning up the factories. Injecting the DAO directly instead because
the hardcoded ones are not necessary anymore.