Boathouse3 cleanup