master [more cleaning]