Initial checkin
Removed unused code, removed left over comment.
Fixed compiler warning