Refactoring Entity into Box
Removing Entity