Removed Heartbeats - Revert if Necessary

Just to see how it affects the timeout issues at the moment