Removed last of Ahkab-specific bits