removed todo comments and traces