Removed dev TODO