Update to version 1.6.1, remove 1.3 support, some clean up