Features functionality removed from master.