Remove unused properties
Fix debugger not window restoring correctly