Removed post checks for registry and builder