Fixed: display problem, Update: remove unused code