remove unneeded logging
added TODO