Removing this line, put back after DB finish