Remove few TODO items and improve sample usage