Added DirectMessages
Remove some test crud