Garbage and move logic to commands