Minor fixes, remove obsolete configurations