Remove unused library & Fix bug