Flagged some incomplete code.
Removed unused code.