Code cleaning
- Removed unused code
- Pointed out where additional comments
on code functionality is severely needed.