Remove Goomanager. Add prop tweaks