[0.0.34m] Some clean up