Removed old MPSettings class
Added some TODO comments
Added comments