Clean up messages controller