changes according to cleanup