Removed lines of code for debugging, irrelevant TODOs.