Remove & Refactor

Remove useless code and resources, rename member value.