- Removed unused code, CS, Cosmetics