@wip Clean up redirect code