Clean-up exercise for first beta-release