remove puts and todo

Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>