Cleanup contact actions. Close #377