Reorganize, test and clear capability handling.