Some cleanup for move component demo