refactored builder, unlink plans