Finished refactoring LS475
Removed unused dicts