MISC - Remove the some TODO