Cleaned up some deprecated method and classes and added some TODOs in the Index model