[TASK] Clean-up currently unused components