diff --git a/.gitignore b/.gitignore
index cd80ba4d06..7a96f5bbc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,176 +1,171 @@
 # Common
 \#*
 .\#*
 GPATH
 GRTAGS
 GTAGS
 TAGS
 Makefile
 Makefile.in
 .deps
 .libs
 *.pc
 *.pyc
 *.bz2
 *.tar.gz
 *.rpm
 *.la
 *.lo
 *.o
 *~
 *.gcda
 *.gcno
 
 
 # Autobuild
 aclocal.m4
 autoconf
 autoheader
 autom4te.cache/
 automake
 build.counter
 compile
 config.guess
 config.log
 config.status
 config.sub
 configure
 depcomp
 install-sh
 include/stamp-*
 libltdl.tar
 libtool
 libtool.m4
 ltdl.m4
 ltmain.sh
 missing
 py-compile
 m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 test-driver
 ylwrap
 
 # Configure targets
 Doxyfile
 coverage.sh
 cts/CTSvars.py
 cts/HBDummy
 cts/LSBDummy
 cts/benchmark/clubench
 cts/lxc_autogen.sh
 extra/logrotate/pacemaker
 include/config.h
 include/config.h.in
 include/crm_config.h
 lrmd/pacemaker_remote
 lrmd/pacemaker_remoted
 lrmd/pacemaker_remote.service
 mcp/pacemaker
 mcp/pacemaker.combined.upstart
 mcp/pacemaker.service
 mcp/pacemaker.upstart
 pengine/regression.core.sh
 publican.cfg
-shell/modules/help.py
-shell/modules/ra.py
-shell/modules/ui.py
-shell/modules/vars.py
 tools/cibsecret
 tools/coverage.sh
 tools/crm_error
 tools/crm_mon.service
 tools/crm_mon.upstart
 tools/crm_report
 tools/report.common
 lrmd/regression.py
 fencing/regression.py
 
 # Build targets
 *.7
 *.7.xml
 *.7.html
 *.8
 *.8.xml
 *.8.html
 attrd/attrd
 doc/*/en-US/images/*.png
 doc/*/tmp/**
 doc/*/publish
 cib/cib
 cib/cibmon
 cib/cibpipe
 crmd/atest
 crmd/crmd
 doc/api/*
 doc/Clusters_from_Scratch.txt
 doc/Pacemaker_Explained.txt
 doc/acls.html
 doc/crm_fencing.html
 doc/publican-catalog*
 fencing/stonith-test
 fencing/stonith_admin
 fencing/stonithd
 fencing/stonithd.xml
 lrmd/lrmd
 lrmd/lrmd_internal_ctl
 lrmd/lrmd_test
 mcp/pacemakerd
 pengine/pengine
 pengine/pengine.xml
 pengine/ptest
-shell/regression/testcases/confbasic-xml.filter
 scratch
 tools/attrd_updater
 tools/cibadmin
 tools/crm_attribute
 tools/crm_diff
 tools/crm_mon
 tools/crm_node
 tools/crm_resource
 tools/crm_shadow
 tools/crm_simulate
 tools/crm_uuid
 tools/crm_verify
 tools/crmadmin
 tools/iso8601
 tools/crm_ticket
 tools/report.collector.1
 xml/crm.dtd
 xml/pacemaker*.rng
 xml/versions.rng
 doc/shared/en-US/*.xml
 doc/Clusters_from_Scratch.build
 doc/Clusters_from_Scratch/en-US/Ap-*.xml
 doc/Clusters_from_Scratch/en-US/Ch-*.xml
 doc/Pacemaker_Development.build
 doc/Pacemaker_Development/en-US/Ch-*.xml
 doc/Pacemaker_Explained.build
 doc/Pacemaker_Explained/en-US/Ch-*.xml
 doc/Pacemaker_Explained/en-US/Ap-*.xml
 doc/Pacemaker_Remote.build
 doc/Pacemaker_Remote/en-US/Ch-*.xml
 lib/gnu/libgnu.a
 lib/gnu/stdalign.h
 *.coverity
 
 #Other 
 mock
 HTML
 pacemaker*.spec
 pengine/.regression.failed.diff
 coverity-*
 
 compat_reports
 .ABI-build
 abi_dumps
 logs
 
 *.patch
 *.diff
 *.sed
 *.orig
 *.rej
 *.swp
 pengine/test10/shadow.*