- Removed unneeded lines.
- re-added back some lines.