Removed commented out relay code