refactor code
remove old draw