Removing hardcodedDao and related factory