Merge "Remove pre-ICS crap."