Cleanup, removed comments.