Cleanup, plug Vadim in templates