Clean up goal schema