Cleanup and added relay