Manu develop

cleanup