Cleanup base model & default.xml