Source  formated, remove dead code