Add missing code, Remove unuse codes