New surf_n_bed plus cleanup