Put back features, remove uneeded config