Remove poop
Merge branch 'remove-poop'