Updating TODOs
Remove unused bootstrap dependency