Remove unneded prints, add TODO