removed todo notes ;)