Reverting the changes now that we have proper

maker import
Fix DRY in Maker_ID code
Fix DRY in Maker_ID code -2