removing some TODO