Clean up code. Eliminate XML file.