Remove un need code and keep working on populating the fields.