Combustible cladding is set to be removed from two “high risk” buildings containing businesses and shops at a marina.