Removing unused relics of Master-Detail template