- Removed unnecessary code, CS