More Remove unnecessary code