Cleanup, Add component creation