cleanup: simplified system configuration