under working,  remove unused codes, etc.