Removed functions/components that are no longer needed