Kaspresso clean-up merged

Github Contribution