Cleanup and removing empty todo