rm memory hog
Merge commit 'ef4ba97'