added TODOs, removed non used class