remove non-existing data test + some code polishing