additional guidelines cleanup