Remove todo list from readme and cleanup some header includes