minor [p time] cleanup in master