Removed old imports, added /msg support