unnecessary objects cleanup #2