Code cleanup

No need to leave old code as a comment.