Simplify __declare_last__; Remove not needed code in _save_data