Kta cleanup

Two commits, the first one cleans up in the source, the second one is a single commit just removing the file.