clear some TODOs from shapes