[CodeCleanup] Moved some methods around, to better match the existing '#pragma mark' sections. Removed a big commented block of unused code.