Remove no needed code and added task to populate database