Cleaned up the Component