update
refactoring
remove junks