updates and cleanup for poky 1.6.1