Skip to content

Clean up TODOs

Clean up TODOs #10