Cleaned up the headhunters scaffold