Removed database message source. Not using that startegy at the mmoment