Remove unnecessary call
Move things only when needed