Remove unused initialization; little bug fixed;