refactor
remove unneeded code