remove lots of todo stuff