- major code cleanup
- simplification of setup files