Removing some old / unused partials and includes