Remvoe hard-coded checkboxes