Code cleanup
More cleanup of old code, Changes to input data structures