#649 More code we don't need anymore and more enhancements