Remove some unnecessary code
Fix mature flag saving