Update ObjectSelection, remove stupid ASM code and fix collisions