Update Boon 0.5-SNAPSHOT + massive clean up