Cleaned up plan branch