Unused code cleanup.
Resolving TODOs.
Responsive.