removed commected code
universe class has move all now