where are these two here but commented out? should they just be removed?