remove unused function and view
modify order function