Removing guard dependency