Code cleanup, remove todos