Cleanup and release 1.2.0