Cosmetics: removed unused code