Remove previous implementation of relayout on remove. Joaos is better