[Task 713] cleaned up nonessential entities