v0.93 Clean-up