General cleanup for 2.0.0 release :+1: