Cleans up unused bits
Merge remote-tracking branch 'origin/feature/jekyll' into feature/jekyll