Some code cleanup afterwards ...