Code cleanup caused by #1