Cleanup (#311)