changed DontRemove to Saveable and had Saveable require Actor. Also refactoring related to that removing excess code