Remove some useless metadata management during node creation
Remove old code