merge branch fix/cleanup