Cleaned up remaining TODOs, console.logs and comments.