More Code Cleanup from Previous Material Links Implementation