Cleanup
ver 0.7.5