Removed dev TODOs