Clean - up

Remove all of the comment-out