Remove TODO and pending spec