Remove configstore
Remove obsolete includes