Stripping out some unused old code for clarity.