Removed 200 or so //todo lines