Added removal hook for components