clean up, add cube entity