Remove obsolete and commented configurations