Clean dead Code