Removing unecessary TODOs in preperation for merging audit-mode to master