GameComponent cleanup, cleanup of previous merge