clenup fromsts merge