Removed TODO
Removed unused component