- Cleaned some unused codes