add fixes for urgent cleaning