Forgot to actually remove them
Merge pull request #1319 from xoppa/various

Forgot to actually remove them