Remove annotations related dead code