Deleting extra code. CLOC: 1661 lines.