Unused code in removed