Code cleanup to remove unnecessary methods/comments.