Update, clean custom config and bump to v4.0.5