Delete thrash, refactoring Object.cs