(v1.1.0) Various cleanup