minor code clean
clean legacy code