GingerSony clean up