Removed lots of TODO statements that were turning into issues