Merge "Remove dummy plans"