removed todos ;)