Cleanup and introduced ColliderComponent