removed logs
added TODOs