Some clean up for GingerSony build