small refactoring

I removed some leftovers from previous version.