Remove deprecated files
Re-enable saving / loading