Tweaked Titan formatting; removed more dead code