Fixed bugs with old files requiring gems no longer in use.