WM: Cleanup, closes #506, closes #360