Cleanup for release 0.2