Removed all TODO mark