Cleanup:
Deleted old TODOs
Deleted commented out code
Removed categories since we aren't using them anymore
Auto formatted everything