v 0.93 Clean-up