clean code and refactor
remove unused code