Cleanup of redirector repo, removing and adding mappings, tests and comments